From 981d16a1283767c9b6ace56ec5814b8238c7a381 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Thu, 19 Jan 2006 09:12:40 +0100 Subject: [PATCH] Cleanup dirty code avoiding warning messages when compiling ioemu. Signed-off-by: Haifeng Xue --- tools/firmware/vmxassist/acpi_madt.c | 1 - tools/ioemu/audio/noaudio.c | 2 -- tools/ioemu/cpu.h | 3 +++ tools/ioemu/hw/pc.c | 2 -- tools/ioemu/vl.c | 2 +- tools/ioemu/vl.h | 3 +++ 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/firmware/vmxassist/acpi_madt.c b/tools/firmware/vmxassist/acpi_madt.c index 8e86646067..59e47b71c7 100644 --- a/tools/firmware/vmxassist/acpi_madt.c +++ b/tools/firmware/vmxassist/acpi_madt.c @@ -55,7 +55,6 @@ static struct hvm_info_table * get_hvm_info_table(void) { struct hvm_info_table *t; - int i; if (table != NULL) return table; diff --git a/tools/ioemu/audio/noaudio.c b/tools/ioemu/audio/noaudio.c index 819de1e538..a192885a72 100644 --- a/tools/ioemu/audio/noaudio.c +++ b/tools/ioemu/audio/noaudio.c @@ -41,7 +41,6 @@ static void no_hw_run (HWVoice *hw) { NoVoice *no = (NoVoice *) hw; int rpos, live, decr, samples; - uint8_t *dst; st_sample_t *src; int64_t now = qemu_get_clock (vm_clock); int64_t ticks = now - no->old_ticks; @@ -82,7 +81,6 @@ static int no_hw_write (SWVoice *sw, void *buf, int len) static int no_hw_init (HWVoice *hw, int freq, int nchannels, audfmt_e fmt) { - NoVoice *no = (NoVoice *) hw; hw->freq = freq; hw->nchannels = nchannels; hw->fmt = fmt; diff --git a/tools/ioemu/cpu.h b/tools/ioemu/cpu.h index a3e24f2ea9..080362eaa1 100644 --- a/tools/ioemu/cpu.h +++ b/tools/ioemu/cpu.h @@ -63,6 +63,9 @@ int cpu_get_pic_interrupt(CPUX86State *s); /* MSDOS compatibility mode FPU exception support */ void cpu_set_ferr(CPUX86State *s); +/* helper2.c */ +void cpu_x86_set_a20(CPUX86State *env, int a20_state); + #if defined(__i386__) || defined(__x86_64__) #define TARGET_PAGE_BITS 12 #elif defined(__ia64__) diff --git a/tools/ioemu/hw/pc.c b/tools/ioemu/hw/pc.c index 055ab885a5..c786132d14 100644 --- a/tools/ioemu/hw/pc.c +++ b/tools/ioemu/hw/pc.c @@ -382,8 +382,6 @@ void pc_init(uint64_t ram_size, int vga_ram_size, int boot_device, { char buf[1024]; int ret, linux_boot, initrd_size, i, nb_nics1; - unsigned long bios_offset, vga_bios_offset; - int bios_size, isa_bios_size; PCIBus *pci_bus; extern void * shared_vram; diff --git a/tools/ioemu/vl.c b/tools/ioemu/vl.c index f38f90b0c6..736a762d19 100644 --- a/tools/ioemu/vl.c +++ b/tools/ioemu/vl.c @@ -1204,7 +1204,7 @@ int store_console_dev(int domid, char *pts) return -1; } strcat(path, "/console/tty"); - if (!xs_write(xs, NULL, path, pts, strlen(pts))) { + if (!xs_write(xs, XBT_NULL, path, pts, strlen(pts))) { fprintf(logfile, "xs_write for console fail"); return -1; } diff --git a/tools/ioemu/vl.h b/tools/ioemu/vl.h index fa03595a65..2b30dc8f26 100644 --- a/tools/ioemu/vl.h +++ b/tools/ioemu/vl.h @@ -354,6 +354,9 @@ int register_savevm(const char *idstr, void qemu_get_timer(QEMUFile *f, QEMUTimer *ts); void qemu_put_timer(QEMUFile *f, QEMUTimer *ts); +/* port-e9.c */ +void port_e9_init(void); + /* block.c */ typedef struct BlockDriverState BlockDriverState; typedef struct BlockDriver BlockDriver; -- 2.30.2